Skip to content

Fix ApplyUpgrade measure and most CI failures#1556

Merged
shorowit merged 9 commits into
developfrom
fix_apply_measure
May 8, 2026
Merged

Fix ApplyUpgrade measure and most CI failures#1556
shorowit merged 9 commits into
developfrom
fix_apply_measure

Conversation

@shorowit

@shorowit shorowit commented May 7, 2026

Copy link
Copy Markdown
Contributor

Pull Request Description

Fixes the ApplyUpgrade measure. It was previously not working, as it broke in this commit. CI error:
SyntaxError: resstock/measures/ApplyUpgrade/measure.rb:519: syntax error, unexpected end-of-input

This PR also fixes a number of other CI failures. After this PR, all tests now pass except for postprocessing-tests and sdr-integration-tests (which are both related to resstockpostproc changes and is being worked on here).

Related Pull Requests

[related PRs from different repositories]

Related Issues

[What issue(s) is the PR addressing]

Checklist

Required:

Optional (not all items may apply):

@shorowit shorowit self-assigned this May 7, 2026
@shorowit shorowit added the bug label May 7, 2026
- uses: actions/add-to-project@v1.0.0
with:
project-url: https://github.com/orgs/NREL/projects/38
project-url: https://github.com/orgs/NatLabRockies/projects/38

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes the CI failure

Comment thread .github/workflows/config.yml Outdated
OPENSTUDIO_EXT: deb
OPENSTUDIO_URL: https://github.com/NREL/OpenStudio/releases/download/v3.10.0
BUILDSTOCK_BATCH_BRANCH: develop
BUILDSTOCK_BATCH_BRANCH: fix-pandas3

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will revert before merging.

steps:
- name: Checkout feature branch
uses: actions/checkout@v4
uses: actions/checkout@v6

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bump many GHA versions to avoid CI warnings.

Comment on lines +409 to +410
return false
end

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the original bug I was fixing in the PR

Comment on lines +115 to 116
deltas[deltas.columns] = deltas[deltas.columns].astype('object')
deltas.fillna('n/a', inplace=True)

@shorowit shorowit May 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pandas bugfix: upcasting now throws an error (i.e., where we assign strings into a dataframe with doubles, resulting in everything being upcast to object). This bugfix uses the solution from the link that "retain[s] the current behaviour".

feature_df = group_df.merge(feature_df, 'outer', left_index=True, right_index=True)\
.groupby(aggregate_columns)
if aggregate_function == 'sum':
base_df = base_df.sum(min_count=1).stack(dropna=False)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pandas bugfix: dropna is no longer any argument for stack, see here

@shorowit shorowit changed the title Fix ApplyUpgrade measure Fix ApplyUpgrade measure and most CI failures May 8, 2026
@shorowit shorowit requested a review from rajeee May 8, 2026 17:40

@rajeee rajeee left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the bug and bunch of other issues allowing many of the previously failing CI job to run successfully. While there are still lingering issues on the postprocessing due to interplay with buildstockbatch, I think this PR is already doing more than required so should be good to merge.

@shorowit shorowit merged commit b7da4fb into develop May 8, 2026
@shorowit shorowit deleted the fix_apply_measure branch May 8, 2026 18:46
shorowit added a commit to NatLabRockies/OpenStudio-HPXML-Calibration that referenced this pull request May 11, 2026
4ba999f70e Misc cleanup based on testing.
1d4131f375 Merge pull request #2214 from NatLabRockies/ducs_in_belly
55bea4e7c2 Update docs [ci skip]
f9f6f75a33 Latest results. [skip ci]
5f07d2a4c4 Merge pull request #2213 from NatLabRockies/pandas_comparepy
43e085acc1 Tweak assumptions based on newer paper.
db9d3933b1 Latest results. [skip ci]
f33928f2a7 Clean up docs/comments [ci skip]
d4b3438041 Fix ducts located in manufactured home belly.
ed0ef25260 Update compare.py to address newer pandas changes. Backported from NatLabRockies/resstock#1556

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: 4ba999f70e5560103c2124acbdd04ba9df2cf8e2
shorowit added a commit to NatLabRockies/OpenStudio-HPXML-Calibration that referenced this pull request May 14, 2026
* Squashed 'src/OpenStudio-HPXML/' changes from d64c6c94ea..552bb776cf

552bb776cf Merge pull request #2212 from NatLabRockies/unmet_hours_warning
3b3fa21add Latest results. [skip ci]
4cc257fc02 Rename sample file names for consistency.
c2da62e6e7 Fix tests.
af157eb679 Update test.
389f146fad Adds a warning if there are more than 300 unmet hours for heating or cooling.
c70dade29e Merge pull request #2211 from NatLabRockies/ems_long_line_error
2628068156 Latest results. [skip ci]
b870a4379e It's just one zip now [ci skip]
a2467d560c Reduce number of OpenEI rates to test, 500 is more than enough. [ci skip]
e6b8eb9a65 Shift a few more simulations to the first CI job to make their runtimes more equal. [ci skip]
b5f7e49b07 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into ems_long_line_error
adbf53a322 Merge pull request #2207 from NatLabRockies/update_energy_rates
e7b7aff616 Minor cleanup [ci skip]
262b22d82a Forgot to add new file. And update Changelog.md
ab126394c0 Split component load EMS line into multiple lines. Add test file.
3c2b7439d2 Enhance changelog language [ci skip]
0f3cda4097 Merge branch 'update_energy_rates' of github.com:NREL/OpenStudio-HPXML into update_energy_rates
544afad098 run tasks.rb update_measures
cbfe83fd7d Update changelog
3baf3a14b4 Latest results. [skip ci]
b19661b21b Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_energy_rates
0b85fe2cef Refactor get_eia_seds_rate to simplify rate retrieval logic
7b35fb824b Merge pull request #2182 from NatLabRockies/blower_off_delay
da43aec525 Latest results. [skip ci]
b9e445b771 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into blower_off_delay
0e00e6ed9c Latest results. [skip ci]
71b9134bad Fix xml
d9ffd52117 tasks.rb update_measures
7c5f8094f8 Fix tests
4c55cf5e67 Update the README
f9e73be820 Use the most recent year's non-zero fuel rates for each state/fuel combo
593a4df0ef Rename pr_all_update.csv to eia_fuel_rates_by_state.csv
e73b0ab1a1 Remove coal rate mention from README and handle coal file checks in util.rb
95506962ad Merge branch 'master' of github.com:NREL/OpenStudio-HPXML into update_energy_rates
98c3ea0d05 run rubocop again
645fdc4c29 Merge pull request #2209 from NatLabRockies/update_openei_rates
48199e47fc Pull in latest OpenEI rates.
8d0dd059cf Merge pull request #2206 from NatLabRockies/pv_grid_connection_fee_bugfix
8450a45c97 run tasks.rb update_measures
d7ce9ce73c Update fuel_type to fuel in utility bills and related CSV headers
5e165986c0 update tasks.rb to hit the EIA API; download the data into a CSV; update the OS-HPXML code to use it
61016e04c3 Add bugfix and tests.
712d41f0f5 Initial cleanup before the bugfix.
66ef3dbf7f Merge pull request #2189 from NatLabRockies/refactor_sensors
d2ad754ad9 A little cleanup.
24e0c0b314 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into refactor_sensors
045f84b4a8 Merge pull request #2151 from NatLabRockies/address-crankcase-defrost-pan-warning
2b44b268e8 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
4eedfa4aa5 Merge pull request #2201 from NatLabRockies/replace_one_based_arrays
c0bb4199eb Revert these
aa1944871a Missed one schedule class, and a little cleanup.
6a39644f6b Replace final (?) set of 1-based arrays in the code.
1f5d5b26c2 Latest results. [skip ci]
d7d2ac9add Latest results. [skip ci]
60e8f0c19b Merge branch 'address-crankcase-defrost-pan-warning' of github.com:NREL/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
af6e7cf739 Update crankcase heater run logic during unavailable periods.
46d51ed185 Merge branch 'address-crankcase-defrost-pan-warning' of https://github.com/NatLabRockies/OpenStudio-HPXML into refactor_sensors
e254a2b852 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
6bef079d4c Merge pull request #2193 from NatLabRockies/thermostat_sensors
6596fbbba6 Update changelog [ci skip]
9abea2145a Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into thermostat_sensors
605ee72375 Merge pull request #2196 from NatLabRockies/ci_skip
40369bd246 Merge pull request #2199 from NatLabRockies/measure_xml_name
4a34713c1e Fix program.
8fe5c5fd12 Pull in logic from PR 2193
bb46081901 Merge branch 'address-crankcase-defrost-pan-warning' of https://github.com/NatLabRockies/OpenStudio-HPXML into refactor_sensors
1ad01f11c6 Change case of class name to fix name in measure.xml.
58985c0c9e Latest results. [skip ci]
c9f5b5cd27 Merge branch 'ci_skip' of https://github.com/NatLabRockies/OpenStudio-HPXML into ci_skip
7a842e4897 Revert temporary model change used for testing
a94605bbb2 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
42597849e2 Simplify logic; no diffs expected.
3b30d7b127 Latest results. [skip ci]
918b61c60f Merge pull request #2197 from NatLabRockies/fix_typos
ef571a9c35 Fix a couple typos in docs/code. [ci skip]
45cf959171 Skip automated CI pushes from triggering another CI run.
56b8ab9e07 Latest results.
031529bb11 Include availability sensors in compressor lockout program line.
747e359055 Update the new changelog entry.
8eefb0df0a Bit of refactoring around variable definitions, per review.
cbc3a2d030 Latest results.
6434c0e73f Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
00b0f93325 Update links [ci skip]
19caeeab1f Merge pull request #2192 from NatLabRockies/ddb_timeseries_setpoints
acd110f2a1 A little more docs cleanup [ci skip]
c3262efecb Document deadband adjustment for timeseries setpoint outputs. [ci skip]
118e9b5bae Latest results.
0453037069 keep previous logic while using new sensors
03e4692033 change sensors for two research feature EMS programs
a5321e3656 Switch to using thermostat setpoint schedule values everywhere.
3f4ed67de9 Switch to using schedule values.
ff80104be0 Fix timeseries heating/cooling setpoints reported when using on-off thermostat deadband model.
14f7adc197 Merge pull request #2191 from NatLabRockies/unmet_hours_ddb
9886e70929 Clean up documentation; clarify it applies to cooling. [ci skip]
954ed067f8 Update Changelog.md
9fe269cc30 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into blower_off_delay
f95da7d899 Latest results.
b1fd092a22 Bugfix.
a1b4d5ec09 Latest results.
1cc0933309 Latest results.
5577137209 More bugfixes.
dd8f4ee151 Fix use of deadband in unmet hours calculation; add tolerance.
fe90374e01 Latest results.
d4132dcb4e A bit more cleanup.
6d269bfa9e Latest results.
668be070a3 Another bugfix.
dcb5f83e9c Latest results.
79088abbb1 Bugfix to address difference between setpoint 'schedule value' and zone reported setpoint with respect to deadband.
e28c791550 Latest results.
27df67b2a5 Some more reuse of sensors.
00b0769ecf Need to revert this change. Setpoints need to be defined before we create geometry (for Kiva initial temperature estimate).
261b054ff4 Added comments to the blower off delay program to clarify equations based on the Shirey et al report.
e21cad37e3 Merge branch 'address-crankcase-defrost-pan-warning' of https://github.com/NatLabRockies/OpenStudio-HPXML into refactor_sensors
22e0d234fb Add site & conditioned zone sensors upfront and reuse them throughout the code. Prevents duplicate sensors from being created.
9c4b80bb81 Latest results.
546ddbb75d Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into address-crankcase-defrost-pan-warning
209c72c378 Merge pull request #2186 from NatLabRockies/shared_water_heater_location
f6bea06dcf Bump GHA version
6d1b9c9b4c Latest results.
257756ad51 Make sample files with shared water heaters more realistic by moving the water heater outside of the home's conditioned space.
e662d6fa87 Merge pull request #2185 from NatLabRockies/hot_water_gallons_with_solar_fraction
3e263f625d Latest results.
1cda58ce3d Bugfixes, cleanup.
11a6fda101 Refactor inputs, update docs and sample files.
a90387bb5e Latest results.
3f6b8dedbb Update Changelog.md [ci skip]
1b604a3ab5 Initial fix. Note that we have to associate Water Use Equipment objects with a given HPXML WaterHeatingSystem so that we can apply the solar fraction adjustment specific to the water heaters referenced by the solar system.
a6d7be1195 Latest results.
522a709558 Update TMY3 zip URL in docs [ci skip]
69e7703b92 Remove passing model into get_object_outputs_by_key.
5e8f7940be Merge branch 'master' into address-crankcase-defrost-pan-warning
2029d99881 Latest results.
24da7fd94f Add mech vent to our dehumidifier files and move them to Houston.
8949e5558a Latest results.
f5de21c4a2 Move actual cfm/ton values to HVAC constants. Small fix to fan coil airflow rate.
aafa29229e Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into blower_off_delay
2377336757 Merge pull request #2183 from NatLabRockies/buildreshpxml_attach_adiabatic_floors
496c8db152 Replace 400 with RatedCFMPerTon [ci skip]
176428e9b3 Fix copy/paste issue [ci skip]
87217f46b7 Fix adiabatic surfaces not being attached to attics/foundations in the BuildResidentialHPXML measure. Also, for files that we manually modify in tasks.rb, fixes some of the attic/foundation attached surfaces (and adds error-checking to ensure we update them for future files).
17b194f191 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into buildreshpxml_attach_adiabatic_floors
07f7d6b90d Latest results.
b18f26fd2e Incorporate unit multiplier
f52fc86a1b Remove continuous fan mode.
2562fa3a6b Fix CI (whole SFA/MF buildings)
251b294671 Initial cut at adding blower off delay/latent degradation model.
ddd954f4f1 Merge pull request #2181 from NatLabRockies/nlr_links
172d90dc4f Update links to websites/docs.
3a766145c3 Clarify "Load: Heating: Heat Pump Backup" output. [ci skip]
7671191583 Merge pull request #2176 from NatLabRockies/schematron_messages
28b6e7707c A bit more simplification/cleanup.
613807f79b Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into schematron_messages
15c937f3d6 Merge pull request #2177 from NatLabRockies/replace_ep_post_processing
874dc4c1c7 Cleanup Changelog.md [ci skip]
9debff6bfd Merge branch 'replace_ep_post_processing' of https://github.com/NatLabRockies/OpenStudio-HPXML into replace_ep_post_processing
55e79ee283 Final cleanup.
8ef336bad3 Latest results.
c4a9673cb7 Reintroduce warmup check.
68c38d35d0 Simplify `setup_timeseries_includes` a bit.
7006992343 Updates the water heater EC_adj EMS program to similarly use Outputs.get_object_outputs_for_hpxml_system() in order to dynamically obtain all the relevant energy use sensors.
5c00d690c2 Latest results.
3bd16e204a Bugfix.
1761615d71 Attempted fix/refactor.
af9c9a31eb Merge branch 'replace_ep_post_processing' of https://github.com/NatLabRockies/OpenStudio-HPXML into replace_ep_post_processing
79a10728b2 Add HP test file.
73f40bc9bc Latest results.
4a097aefca Avoid EMS program when DSE=1.
0cf0c5fc30 Move code to a separate method in case we want to reuse it for water heater EC adj calculation. Bugfix for HP backup systems.
045d3fe88f Bugfix.
f53be16aab Allow DSE for utility bills.
e4235d2f40 Fix for multiple dwelling units (credit to @joseph-robertson).
e2cc04fd9e Apply unit multiplier.
7f7c40697c Allow DSE for first timestep.
5aef5f8019 Consolidate code.
3ce5fd4da9 Document method.
f0e1b85422 Simplify method by applying to only one mode (htg or clg) at a time.
8066d54be1 First cut on using an EMS program to apply DSE instead of E+ post-processing.
41d92b7a83 Merge pull request #2173 from NatLabRockies/peak_load_output_units
91c9753d51 Revert.
99c89d8bb4 A bit more cleanup of error messages. And add some more value checks for extension elements where they didn't exist.
df9ea0f312 Switch to human-friendly error messages in schematron validation.
c585f32a21 Update the changelog. [ci skip]
5e820e6180 Replace a few remaining TODO comments. [ci skip]
44ea2e1d04 Latest results.
2afbc95138 Change calling point InsideHVACSystemIterationLoop -> EndOfSystemTimestepBeforeHVACReporting.
54238a30e0 Latest results.
5c2f362190 Merge branch 'master' into address-crankcase-defrost-pan-warning
05a01c6ddf Latest results.
5ca927a2f1 All Btuh outputs now rounded to zero digits.
330e73a654 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into peak_load_output_units
3e384054aa Merge pull request #2175 from NatLabRockies/timeseries_mf_bugfix
e38dd1987e Latest results.
67041d4241 Bump GHAs
936c3dfd3a Use num decimal places consistent with HVAC capacities and design loads.
d359ba0727 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into peak_load_output_units
d43970d61e Bump GHA version
77e71048b2 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into timeseries_mf_bugfix
d2091a3eb6 Fixed inconsistent logic between timeseries column names for zone temperature and zone setpoints when an HPXML is run as a whole SFA/MF building but only has one unit. And removed a method that is no longer needed.
593be3b727 Merge pull request #2129 from NatLabRockies/whole-building-batteries
7d611fb30f Sorry, I really dislike the `...` operator in ruby. It's way too subtle...
1f45f2bb9d Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into whole-building-batteries
e841a07f9e Latest results.
b0fdd8f600 Merge pull request #2174 from NatLabRockies/dfhp_backup_capacities
37ec53b483 Latest results.
3eadacf7fb Refactor unit_meter_name to Model.make_unit_meter_name; also rename Model.make_variable_name to Model.make_unit_variable_name.
18d4e2fb29 Update the changelog.
4226c0a245 Reduce PV size for new sample file.
6ee3135e38 Fixes the furnace capacity in some of our dual-fuel HP sample files. They were still accidentally using 10 kW as if they were all-electric (backup strip heat).
4902275ca1 Use new unit_meter_name method in one more place.
262b248092 Make another custom electricity meter for facility plus generators; this is what TrackFacilityElectricDemandStoreExcessOnSite follows.
00ba5811bb Latest results.
2958bbce7e Continue to track facility for single units with batteries; relax 10x comparison tolerances.
f5b638f4d8 Latest results.
6d40614ef1 **Breaking change**: Annual peak load outputs for heating and cooling now use units of Btu/h instead of kBtu/h for consistency with other outputs.
76cddff3a5 Latest results.
439a2138cf Remove model from being passed into get_object_outputs_by_key.
63dd002073 Merge branch 'master' into address-crankcase-defrost-pan-warning
2195ce9db5 Merge branch 'master' into whole-building-batteries
4bed7c8728 Merge pull request #2171 from NatLabRockies/soil_type
6d93099ef6 Update options in BuildResidentialHPXML measure.
00c89a929d Allows "other" for `SoilType`; adds variation to dry/wet soil conductivity and diffusivity values for unknown/other/loam soil types.
c4572627d5 Merge pull request #2169 from NatLabRockies/schematron_improvements
9ddf2b1697 A couple more.
04d8d4f172 Remove enumeration checks that are already covered by the HPXML schema
466f124e8a Remove checks for optional elements that are already covered by the HPXML schema
e95651c7a6 Removed see [foo] comments.
84846b5437 Removed all unnecessary "Expected 0 or more element(s)" checks.
7b5d0f587b Merge pull request #2165 from NatLabRockies/zero_occupants_with_kwh_per_year
9572280cf5 Set pools/spas to be unavailable during "vacancy" unavailable periods.
c8606abb89 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into zero_occupants_with_kwh_per_year
fae2701be9 Merge pull request #2164 from NatLabRockies/performance_curve_bugfix
6f405981ef Update Changelog.md [ci skip]
1d04a2f002 Zero out pools/spas when there are no occupants (and kWh/year or therm/year are not provided). Add/update tests.
5fe4ad1e26 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into zero_occupants_with_kwh_per_year
4847592511 changelog
34a96b9f7b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix
5d6a151cd4 unit tests
b739f6746f Merge pull request #2166 from NatLabRockies/remove_sizing_objects
6630c301d4 Remove the sizing objects from the model since we don't use them. Currently only removing them when using run_simulation.rb since the OS SDK does not support their removal.
e51e37b344 Update the changelog. [ci skip]
e76a53612b Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into zero_occupants_with_kwh_per_year
9af752f6fb Fixes lighting, plug/fuel loads, and pool/spa energy use from being zeroed out when zero occupants are specified (i.e., unoccupied dwelling unit) but a kWh/year or therm/year value is provided.
a33382e1ad Merge branch 'master' into whole-building-batteries
b222100f47 Merge pull request #2138 from NatLabRockies/unit-fuel-meters
0311b1f177 Update Changelog.md [ci skip]
9cce8759cc Merge branch 'performance_curve_bugfix' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix
7c34495c16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into performance_curve_bugfix
12d4e4e996 Small tweak to warning message [ci skip]
eb5875502d Register a reporting measure warning if dwelling unit timeseries requested but neither total or fuel consumption timeseries requested.
569031f910 Base new whole building with fuels sample file off of whole building sample file.
4301605aec Misc comments, changelog, docs, argument description updates.
5aa5d8814a Update new reporting tests to use whole building file with fuels.
53de43f8b1 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into performance_curve_bugfix
f2da7659f1 Update the changelog. [ci skip]
1cc6fa3827 Merge branch 'master' into unit-fuel-meters
9e90411978 Merge pull request #2163 from NatLabRockies/ext-lights-elec-equip
2dd5c01b9e Add comments [ci skip]
83a91a3118 Latest results.
75def8ac30 bugfix
e1b2f15538 Only create unit meters when either whole building or single unit with battery.
90faede90f Merge branch 'unit-fuel-meters' into whole-building-batteries
a44799b0d8 Clean up and refactor updates for custom meter objects.
8529a6966d Latest results.
22c3b5c450 Updates for adding output meters for critical loads.
db7a32aca3 Avoid meter duplication by using underscore instead of colon in names.
807ac05143 Merge branch 'unit-fuel-meters' into whole-building-batteries
23d6a230f8 Simplify the approach for avoiding the multiple meter reference warning.
e5917306bf Bit more cleanup.
5d166ab103 Merge branch 'unit-fuel-meters' into whole-building-batteries
ccbf8023ea Remove the output variable workaround for interior and exterior lights.
6e6828b2e8 Merge branch 'ext-lights-elec-equip' into unit-fuel-meters
25dce013bc Use zone level meter for interior lights.
27c569b2dd Merge branch 'ext-lights-elec-equip' into unit-fuel-meters
e8468dabdc Remove unit multiplier since exterior lights now how a thermal zone.
a9fec90d1d Remove a debug line.
00f4eed502 Update reporting measure for new exterior lights meters.
574d9e44b7 Update unit tests for exterior lights.
dc5f5f64b5 Model exterior lights using electric equipment objects instead of exterior lights objects.
6572afb552 Revisit special key_vars and simplify; provide more explanation.
ac550d3c4e Remove next line for Electric Storage Charge Energy; it is already covered.
a561b813c2 Replace Fan Electricity Energy with EMS output variables.
7f63b5ef65 Merge branch 'master' into unit-fuel-meters
2b59c689a6 Merge pull request #2162 from NatLabRockies/ems_debug
e1bfa3a02a Latest results.
fbb33a97bb Add check on totals, and clean up error message.
46b2e3f50c Add new whole MF building sample file that is not all-electric.
79ccee089b Minor updates in reporting measure test file.
543961b3e3 Unify all erb files, including vertical choices and default values (even if false).
da3b6ab22a More section rename updates in tests.
bed9c449f4 Rename create_custom_meters to create_custom_electricity_meters.
d8d481ec7c Updates in util.rb for section renames.
7537fa1496 Address first round of review, including docs, argument descriptions, comments, additional properties, output section names.
7f76952f23 Adds a `run_simulation.rb --ems-debug` argument to generate the EnergyPlus EDD file for debugging EMS programs.
c83dbaad39 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into unit-fuel-meters
4ad968e8ba Merge pull request #2161 from NatLabRockies/dfhp_autosizing
0aa340096a Add test.
f8c7cd95dd Latest results.
baecf45aa4 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into dfhp_autosizing
ab143f8e52 Merge pull request #2158 from NatLabRockies/fix_duct_leakage_cfm
9f53cc10a9 Update Changelog.md [ci skip]
2896bcefec Dual-fuel heat pumps with switchover temperatures > 25F are now autosized based on 25F to allow some additional heating capacity buffer.
fd4513d43c Latest results.
1e430d7c92 Merge branch 'fix_duct_leakage_cfm' of https://github.com/NatLabRockies/OpenStudio-HPXML into fix_duct_leakage_cfm
13fab783c1 Merge branch 'master' into address-crankcase-defrost-pan-warning
23f5462a6d Simplify test.
0282fa2e59 Latest results.
f983712562 Remove debug
61d4ebcc3e A couple more test cases.
56a3199d36 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into fix_duct_leakage_cfm
f29c44e460 Avoid adding new sections to docs.
99e89295b8 Minor cleanup in reporting measure.
940eacbb8a Merge branch 'master' into unit-fuel-meters
7db9cc7a6e Merge pull request #2140 from NatLabRockies/battery-resilience-refactor
5a9c2f0e29 Remove an unused timeseries output meter and other minor cleanup.
a4f9f014ff Latest results.
ba58f27c9e Merge branch 'master' into address-crankcase-defrost-pan-warning
fcc41b4914 Merge branch 'master' into battery-resilience-refactor
64a658f8e0 Merge pull request #2137 from NatLabRockies/battery-unit-mults-fix
41bf60100c Update the changelog. [ci skip]
e0bff2effb Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into battery-unit-mults-fix
3bbf62337e Merge pull request #2157 from NatLabRockies/roof_type_in_sizing
951f0104cc Add one more safety check.
5147828972 Latest results.
c5f85cf4a5 Latest results.
b85e3c4b6c Introduce the cooling coil runtime fraction sensor.
7e97c5b1c1 Forgot to save Changelog.md first [ci skip]
f1da956e21 Organize ems sensors.
44b435c9a4 Fixes handling of duct leakage specified using cfm25/cfm50.
c8dd252625 Update measure xml file.
ecdc56543b Bring cycling ratio into the calculation for multispeed objects.
5e0541d0fa Introduce a new sensor for unitary system.
641094cdd9 Put hp heating tout and rtf sensors upstream of defrost and crankcase.
cd0d7abbf9 Merge branch 'master' into address-crankcase-defrost-pan-warning
2abcd8ebd0 Update measure xml.
9345759556 Set additional properties for hp heating tout and rtf sensors.
f46b759dde oops, cool roof in two places
8de3be59c4 unit test and changelog
e81d5ccaf7 fix expanded roof types in hvac sizing
efc4a114ee Merge branch 'battery-unit-mults-fix' into battery-resilience-refactor
0a71401ba1 Merge branch 'master' into battery-unit-mults-fix
b0eca1d65d Merge pull request #2156 from NatLabRockies/nlr
943eb08aae More updates to using NLR.
05cc77f31b Merge pull request #2155 from NatLabRockies/minisplit_hp_pan_heater_control_bugfix
acba058e67 Fixes PanHeaterControlType="heat pump mode" incorrectly disallowed for mini-split heat pumps.
c1c8046511 Latest results.
61a3792681 Revert clg_coil addition in hvac test.
8c263cb8fa Revise and simplify ems logic for unavailable periods.
3a05c70425 Use heating coil runtime fraction for crankcase calculation.
8ba115f851 Latest results.
a215af2439 Use heating and/or cooling availability sensors for crankcase operation.
897e27643f Merge branch 'master' into address-crankcase-defrost-pan-warning
f1781c9391 Merge pull request #2153 from NatLabRockies/fix-unmet-hrs-prg-avail-sensors
51bb6a762b Latest results.
3316eaba99 Crankcase allows zero capacity; slight program fix.
868687105f Remove HVAC availability sensor, reuse cooling availability sensor for natural ventilation too.
6eeaa29c72 Latest results.
e526e2546d Deal with crankcase allocation to heating or cooling.
2873982e62 Remove old crankcase unit test.
77bd27de27 Create heating and cooling EMS sensors up front, and use downstream in pan heater and unmet hours programs.
554afd19e2 Update defrost/pan/crankcase ems test for crankcase changes.
1a40627453 Crankcase into its own program, and remove season from pan and crankcase.
0ff6650e9b Merge branch 'master' into address-crankcase-defrost-pan-warning
e1c49500fd Update tests and docs.
aae60b155b Add crankcase ems program, and use hvac seasons and unavailability periods in defrost, pan, and crankcase ems programs.
8758181d49 Add new sample files for heat pump with hvac seasons, power outage.
b17c8ebd2a Merge pull request #2146 from NatLabRockies/whole-bldg-timeseries-outputs
e05104fe3c Typo [ci skip]
526ce9ecd5 Minor cleanup.
97cd89bea4 Update the changelog.
2e4410011e Clean up sanitize_name method.
1927ba9fa8 Revert all refactor changes for passing hpxml parent object.
18cd9d4bc7 Update reporting measure tests for changed arguments and outputs.
88645dfc56 Update template osw files with argument changes.
1989500eb5 Generalize workflow docs for dwelling unit outputs.
1aa9f70031 Update workflow tests to deal with energy use outputs by unit.
a17b7bbd73 Merge branch 'master' into whole-bldg-timeseries-outputs
d0bde5a473 Report out energy use by dwelling unit.
c564418719 Merge pull request #2148 from NREL/hvac-setpoint-adjustments-cleanup
bd0d780b2f Latest results.
eb2c496d72 Revise reporting measure arguments for dwelling unit outputs.
a859aab9d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac-setpoint-adjustments-cleanup
3f8e062055 Merge pull request #2150 from NREL/bump-version-1.12.0
b1d8552349 Add a changelog entry.
05ce3e3dd6 Add sample file with no overlapping seasons and inverted setpoints.
a6edb4ab2e Bump version for next release
0b195ed000 Code cleanup, comments.
d1a40c1083 Instead, only throw the original setpoint adjustment warning for overlapping seasons.
28c89558a5 Clarify effects of setpoint adjustments during non-overlapping seasons.
254db4a5a6 Simplify further.
6615fbb0d5 Simplify the sanitize_name method.
496fdfe4d6 Update whole-building timeseries unit test.
200cd26e5d Bit of refactoring so we can report <BuildingID> instead of Unit1, etc in whole-building timeseries.
bdd9863439 Fix new workflow outputs table.
2afba3c528 Typo in reporting measure test updates.
63ec7b781f Update the workflow outputs docs.
338c2b2808 Update the template osw files with new reporting measure arguments.
f2a9708a3f Add whole-building reporting measure tests.
04d60c3194 Latest results.
e703540467 Update battery and vehicle tests.
c888e49449 Create unit meters for single unit models so we can track electricity in ELCD.
3e1cb0ba31 Request output meters for critical load by unit.
ada42d3aa4 Update unit tests.
7afce5aec4 Merge branch 'unit-fuel-meters' into whole-building-batteries
d813778b2a Merge branch 'battery-resilience-refactor' into unit-fuel-meters
a90071f327 Remove battery loss addition in resilience calculations.
7011831095 Merge branch 'battery-unit-mults-fix' into battery-resilience-refactor
45b93fb448 Latest results.
2c17215399 Initialize the unit_fuel_data array.
ea635ce68a Update run_simulation.rb for new arguments.
70ee94d181 Add unit fuel arguments, and updates for timeseries outputs.
5ce4d0626b Latest results.
46ffdcf5ed Avoid writing every unit fuel use to results_simulations_energy.csv.
f056a88625 Merge branch 'master' into unit-fuel-meters
27becb9d00 Merge branch 'master' into battery-unit-mults-fix
4332686402 Latest results.
693bb13e69 Apply DSE multiplier to unit fuel meters.
cd7879882c Avoid the referenced multiple times warning altogether.
4a55a5b93b Slight renaming for consistency.
0eef0a49bf Merge branch 'master' into battery-resilience-refactor
27a2fad9ae Merge branch 'master' into unit-fuel-meters
a0cc74bc70 Use only output variables in PV custom meter.
ca4064ff7a Use custom meter as source meter on MeterCustomDecrement.
8306c05863 Call create_custom_meters from create_custom_unit_meters so we get Total and Net for each unit.
172313afcf Latest results.
34b9d0d841 Merge branch 'master' into unit-fuel-meters
35585ccecf Remove extra battery losses addition in resilience calculations.
92e432a728 Revert some new logic, and follow setup similar to total/net meters.
47255e2adc Merge branch 'master' into battery-resilience-refactor
0ae7bdba69 Request output meter with battery losses, which already includes unit multiplier.
6389829e7d Latest results.
c2564bdb54 Merge branch 'master' into battery-unit-mults-fix
1921ea45ae Update the comment too.
c47cb765a0 Decrement generators for critical load.
9e75d62ac8 Latest results.
cab4952727 Use new critical load custom meter in resilience calculations.
aac2fc3bf6 Create critical load custom meter.
567b17744b Latest results.
f9ad57422d Account for differences in vehicle end use vs electric produced meter.
5fcbe2d2af Account for differences in vehicle end use vs electric storage meter.
685c374123 Update the changelog. [ci skip]
2f535b8a3d Tighten the check tolerances back up.
069f693e1a Add unit meters and checks for all remaining fuel types.
71871239b5 Multiply battery losses by unit multiplier in resilience calculations.
c410d63650 Latest results.
3c71634c6b Merge branch 'master' into battery-unit-mults-fix
555c94ce74 Merge branch 'unit-fuel-meters' into whole-building-batteries
b51a8665bb Add log exceptions to workflow tests util.rb file.
53ef0f30b4 Update and refactor translator and reporting measures for creating unit electricity meters.
f4e7d7e30d Merge branch 'master' into battery-unit-mults-fix
839b65a6af Relax tolerance a bit for checking battery resilience differences.
263991b9d1 Multiply eff_discharge_power by unit_multiplier for vehicles.
a1b803b410 Update workflow such that batteries with unit multipliers are actually tested.
644b36bfd6 Battery soc kwh can be very small but not zero when using unit multipliers.
6eaece2196 Merge branch 'master' into whole-building-batteries
112c14eced Actually check batteries and vehicles with unit multipliers.
9189c59b00 Instead just except missing custom meters, for now.
c760a6c2c4 Only add production or storage output meters for units with pv/generators or batteries/vehicles.
30dcdef8b5 Update battery and vehicle tests for new storage operation scheme.
44522f9447 Move vehicle charging from electric storage to electricity facility.
a7da12857c Exclude resilience output type from unit multiplier check.
26afb20a21 Need upcase on report meter data.
458cdf2d69 Comment out unitary system ancillary output variables due to nuances.
6756f9ae24 More specific warning message exception.
7d6dfd9e2f Let multiple references warning slide for now.
a0d20a6668 Remove whole building battery test from ruby error messages test.
7e05cb6fc6 Use model objects instead of workspace objects.
911cc545c9 Merge branch 'master' into whole-building-batteries
d8e35051c5 Update resilience calculations to be max across units.
723aa52788 Update the docs.
5d39251969 Create custom fuel meters for electricity, electricity produced, and electric storage.
bc5dc74db5 Merge branch 'master' into whole-building-batteries
47b1a3c1fd Share get_object_outputs_by_key so we can use it to set up custom meter objects.
e50fe3c803 Stub approach for creating custom meters for each unit.
1ca6991c45 Add sample file for whole building with batteries.
4085188c7e BuildResidentialHPXML measure: Attach adiabatic floors to the AboveApartment foundation element and the BelowApartment attic element.

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: 552bb776cf44523ba98e8eca1574d8a7b5381d35

* Squashed 'src/OpenStudio-HPXML/' changes from 552bb776cf..4ba999f70e

4ba999f70e Misc cleanup based on testing.
1d4131f375 Merge pull request #2214 from NatLabRockies/ducs_in_belly
55bea4e7c2 Update docs [ci skip]
f9f6f75a33 Latest results. [skip ci]
5f07d2a4c4 Merge pull request #2213 from NatLabRockies/pandas_comparepy
43e085acc1 Tweak assumptions based on newer paper.
db9d3933b1 Latest results. [skip ci]
f33928f2a7 Clean up docs/comments [ci skip]
d4b3438041 Fix ducts located in manufactured home belly.
ed0ef25260 Update compare.py to address newer pandas changes. Backported from NatLabRockies/resstock#1556

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: 4ba999f70e5560103c2124acbdd04ba9df2cf8e2

* Squashed 'src/OpenStudio-HPXML/' changes from 4ba999f70e..c2a9faed38

c2a9faed38 Update test

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: c2a9faed386bcce85944435aa842579d0feb0cbc

* Squashed 'src/OpenStudio-HPXML/' changes from c2a9faed38..1efd351920

1efd351920 Merge pull request #2216 from NatLabRockies/geothermal_loop_multiple_gshps
6f192c66cf Latest results. [skip ci]
0056a75150 Update tests.
7f54ed9c00 Updates the detailed geothermal loop sample files to be more reasonable. And some misc renaming of variables.
9c1bf40ae5 Cleanup
53a7b4ff2d Further document pump EMS programs.
6507589845 Merge branch 'geothermal_loop_multiple_gshps' of https://github.com/NatLabRockies/OpenStudio-HPXML into geothermal_loop_multiple_gshps
e83de093cc Address some review comments.
2d95a663fe Latest results. [skip ci]
2da6b46d19 Merge branch 'geothermal_loop_multiple_gshps' of https://github.com/NatLabRockies/OpenStudio-HPXML into geothermal_loop_multiple_gshps
20fdbc7dbc Add test file w/ multiple geothermal loops. And fix Detailed Example name in BuildResidentialHPXML option.
b07521f3a5 Latest results. [skip ci]
0f32212ded Oops, remove debug
2de37f7bed Fix CI
36fd82450c Update Changelog.md [ci skip]
db4d588083 Merge branch 'master' of https://github.com/NatLabRockies/OpenStudio-HPXML into geothermal_loop_multiple_gshps
ce61e9dd53 Merge pull request #2215 from NatLabRockies/1_12_0_prep
02ff94c3a3 Allow warnings
c4d7c09d5f Bugfixes, update tests.
25ee765a3e Bugfix, update tests.
940ed3fc71 Update max num of boreholes allowed in schematron.
1ebbd07808 Expand number of supported borehomes from 10 to 15.
5bdda69bae First pass on allowing multiple GSHPs connected to a single geothermal loop.
85a6c9d6aa Latest results. [skip ci]
c43b04b275 Increase unmet hours tolerance to 0.5F (a nice round number).

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: 1efd3519201f208540b1d481c57394088e35da99

* Squashed 'src/OpenStudio-HPXML/' changes from 1efd351920..502811cdfa

502811cdfa Bugfix
5ac2d8195c a better approach
6ce45d71b0 rubocop
354df05890 Clean up release zip
c6f91b3113 Merge pull request #2219 from NatLabRockies/ci_artifact_release
c2f34b0a80 Another try
73d4b757ce Another try.
a481817ec4 Save the release zip as an additional CI artifact

git-subtree-dir: src/OpenStudio-HPXML
git-subtree-split: 502811cdfa5ccf82cd9afd00114a4d49eca85700
bpark1327 added a commit to NatLabRockies/OpenStudio-ERI that referenced this pull request May 15, 2026
ef4dbd827c Latest results. [skip ci]
375bc17b89 Update tests
9196a0b42f Add ref in docs.
3fa33da0e3 Use 1% RH for tolerance.
4d3230fae1 Adds a dehumidification unmet hours output as well as a warning if it is large.
ce61e9dd53 Merge pull request #2215 from NatLabRockies/1_12_0_prep
85a6c9d6aa Latest results. [skip ci]
c43b04b275 Increase unmet hours tolerance to 0.5F (a nice round number).
c2a9faed38 Update test
4ba999f70e Misc cleanup based on testing.
1d4131f375 Merge pull request #2214 from NatLabRockies/ducs_in_belly
55bea4e7c2 Update docs [ci skip]
f9f6f75a33 Latest results. [skip ci]
5f07d2a4c4 Merge pull request #2213 from NatLabRockies/pandas_comparepy
43e085acc1 Tweak assumptions based on newer paper.
db9d3933b1 Latest results. [skip ci]
f33928f2a7 Clean up docs/comments [ci skip]
d4b3438041 Fix ducts located in manufactured home belly.
ed0ef25260 Update compare.py to address newer pandas changes. Backported from NatLabRockies/resstock#1556

git-subtree-dir: hpxml-measures
git-subtree-split: ef4dbd827c0485ea28bd894b3a5a555ca8e1b5a7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants